(set-locale-environment): Fix last change for when the locale's preferences

don't specify any encoding.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 17004f6bcd56a57dae95322eb29d90ea19bb0263..69dbb5c2445d2774463991347ae9ba06b3dc4a02 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2526,7 +2526,9 @@ See also `locale-charset-language-names', `locale-language-names',
        ;; If a specific EOL conversion was specified in the default
        ;; buffer-file-coding-system, preserve it in the coding system
        ;; we will be using from now on.
-       (if (memq default-eol-type '(0 1 2 unix dos mac))
+       (if (and (memq default-eol-type '(0 1 2 unix dos mac))
+                coding-system
+                (coding-system-p coding-system))
            (setq coding-system (coding-system-change-eol-conversion
                                 coding-system default-eol-type)))